projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d4ac34a)
tools: Clean up use of 'install' command.
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Wed, 7 Mar 2007 10:49:20 +0000 (10:49 +0000)
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Wed, 7 Mar 2007 10:49:20 +0000 (10:49 +0000)
- convert raw "install" command to use $(INSTALL)
- convert some $(INSTALL) to $(INSTALL_DATA) as appropriate
- modify the specific $(INSTALL) definitions to use -p.

Original patch by Ben Thomas <ben@virtualiron.com>
Signed-off-by: Keir Fraser <keir@xensource.com>
13 files changed:
config/StdGNU.mk patch | blob | history
config/SunOS.mk patch | blob | history
tools/Makefile patch | blob | history
tools/blktap/lib/Makefile patch | blob | history
tools/console/Makefile patch | blob | history
tools/guest-headers/Makefile patch | blob | history
tools/ioemu/Makefile patch | blob | history
tools/libxen/Makefile patch | blob | history
tools/pygrub/Makefile patch | blob | history
tools/security/Makefile patch | blob | history
tools/vnet/libxutil/Makefile patch | blob | history
tools/xenfb/Makefile patch | blob | history
tools/xenstore/Makefile patch | blob | history

diff --git a/config/StdGNU.mk b/config/StdGNU.mk
index 32a37b44fa9c7548ac6191680843f9c080e8f1dc..8c947f48328bbe6aadb20b49bbd9d8068e27c10a 100644 (file)
--- a/config/StdGNU.mk
+++ b/config/StdGNU.mk
@@ -12,9 +12,9 @@ OBJDUMP    = $(CROSS_COMPILE)objdump
 MSGFMT     = msgfmt
 
 INSTALL      = install
-INSTALL_DIR  = $(INSTALL) -d -m0755
-INSTALL_DATA = $(INSTALL) -m0644
-INSTALL_PROG = $(INSTALL) -m0755
+INSTALL_DIR  = $(INSTALL) -d -m0755 -p
+INSTALL_DATA = $(INSTALL) -m0644 -p
+INSTALL_PROG = $(INSTALL) -m0755 -p
 
 LIB64DIR = lib64
 
diff --git a/config/SunOS.mk b/config/SunOS.mk
index 77e4b2482565bad3cd3b39f45905086faa344a7b..5c12fd4c23a7161902b03f98d169fd7b047f5205 100644 (file)
--- a/config/SunOS.mk
+++ b/config/SunOS.mk
@@ -14,9 +14,9 @@ MSGFMT     = gmsgfmt
 SHELL      = bash
 
 INSTALL      = ginstall
-INSTALL_DIR  = $(INSTALL) -d -m0755
-INSTALL_DATA = $(INSTALL) -m0644
-INSTALL_PROG = $(INSTALL) -m0755
+INSTALL_DIR  = $(INSTALL) -d -m0755 -p
+INSTALL_DATA = $(INSTALL) -m0644 -p
+INSTALL_PROG = $(INSTALL) -m0755 -p
 
 LIB64DIR = lib/amd64
 
diff --git a/tools/Makefile b/tools/Makefile
index 7cd81f87bfe287529a178af326d8051b4e41b4bb..7cf1bed341cb948e1597201aa71a5742e4c304f6 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -41,8 +41,8 @@ install: check
                $(MAKE) -C $$subdir $@; \
        done
        $(MAKE) ioemuinstall
-       $(INSTALL_DIR) -p $(DESTDIR)/var/xen/dump
-       $(INSTALL_DIR) -p $(DESTDIR)/var/log/xen
+       $(INSTALL_DIR) $(DESTDIR)/var/xen/dump
+       $(INSTALL_DIR) $(DESTDIR)/var/log/xen
 
 .PHONY: clean
 clean: check_clean
diff --git a/tools/blktap/lib/Makefile b/tools/blktap/lib/Makefile
index a4880d44cc3fcef0a410e6ec97061af2a84d7d87..d07aef7cce6421932f247f0663d674ee6ea828d8 100644 (file)
--- a/tools/blktap/lib/Makefile
+++ b/tools/blktap/lib/Makefile
@@ -40,8 +40,8 @@ build: libblktap.a
 libblktap: libblktap.a
 
 install: all
-       $(INSTALL_DIR) -p $(DESTDIR)/usr/$(LIBDIR)
-       $(INSTALL_DIR) -p $(DESTDIR)/usr/include
+       $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
+       $(INSTALL_DIR) $(DESTDIR)/usr/include
        $(INSTALL_PROG) $(LIB) $(DESTDIR)/usr/$(LIBDIR)
        ln -sf libblktap.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libblktap.so.$(MAJOR)
        ln -sf libblktap.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libblktap.so
diff --git a/tools/console/Makefile b/tools/console/Makefile
index f33204cfafc37c8b02b27de721cd86f6f571c14c..7a8e15c0a8c9cfa173e1501719c8518ae4fb38aa 100644 (file)
--- a/tools/console/Makefile
+++ b/tools/console/Makefile
@@ -30,7 +30,7 @@ xenconsole: $(patsubst %.c,%.o,$(wildcard client/*.c))
 
 .PHONY: install
 install: $(BIN)
-       $(INSTALL_DIR) -p $(DESTDIR)/$(DAEMON_INSTALL_DIR)
+       $(INSTALL_DIR) $(DESTDIR)/$(DAEMON_INSTALL_DIR)
        $(INSTALL_PROG) xenconsoled $(DESTDIR)/$(DAEMON_INSTALL_DIR)
-       $(INSTALL_DIR) -p $(DESTDIR)/$(CLIENT_INSTALL_DIR)
+       $(INSTALL_DIR) $(DESTDIR)/$(CLIENT_INSTALL_DIR)
        $(INSTALL_PROG) xenconsole $(DESTDIR)/$(CLIENT_INSTALL_DIR)
diff --git a/tools/guest-headers/Makefile b/tools/guest-headers/Makefile
index 1c50599a4c273ab2c51cae88bfb03de19cc168c7..4802e76fad1cec01f867bd3cdc7b692cbbf6767b 100644 (file)
--- a/tools/guest-headers/Makefile
+++ b/tools/guest-headers/Makefile
@@ -13,7 +13,7 @@ check:
 
 install-Linux:
        mkdir -p $(DESTDIR)/usr/include/xen/linux
-       install -m0644 $(linuxsparsetree)/include/xen/public/*.h $(DESTDIR)/usr/include/xen/linux
+       $(INSTALL_DATA) $(linuxsparsetree)/include/xen/public/*.h $(DESTDIR)/usr/include/xen/linux
 
 install-SunOS:
 
diff --git a/tools/ioemu/Makefile b/tools/ioemu/Makefile
index beab19c7720580e421a32cfcfd09ebb545d91c77..6333268289d72268d9c7aee0bfcfacc872ea7ce5 100644 (file)
--- a/tools/ioemu/Makefile
+++ b/tools/ioemu/Makefile
@@ -65,10 +65,10 @@ common  de-ch  es     fo  fr-ca  hu     ja  mk  nl-be      pt  sl     tr
 
 install-doc: $(DOCS)
        mkdir -p "$(DESTDIR)$(docdir)"
-       $(INSTALL) -m 644 qemu-doc.html  qemu-tech.html "$(DESTDIR)$(docdir)"
+       $(INSTALL_DATA) qemu-doc.html  qemu-tech.html "$(DESTDIR)$(docdir)"
 ifndef CONFIG_WIN32
        mkdir -p "$(DESTDIR)$(mandir)/man1"
-       $(INSTALL) qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1"
+       $(INSTALL_DATA) qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1"
 endif
 
 install: all $(if $(BUILD_DOCS),install-doc)
@@ -77,12 +77,12 @@ install: all $(if $(BUILD_DOCS),install-doc)
 #      mkdir -p "$(DESTDIR)$(datadir)"
 #      for x in bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \
 #                      video.x openbios-sparc32 linux_boot.bin; do \
-#              $(INSTALL) -m 644 $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \
+#              $(INSTALL_DATA) $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \
 #      done
 ifndef CONFIG_WIN32
        mkdir -p "$(DESTDIR)$(datadir)/keymaps"
        for x in $(KEYMAPS); do \
-               $(INSTALL) -m 644 $(SRC_PATH)/keymaps/$$x "$(DESTDIR)$(datadir)/keymaps"; \
+               $(INSTALL_DATA) $(SRC_PATH)/keymaps/$$x "$(DESTDIR)$(datadir)/keymaps"; \
        done
 endif
        for d in $(TARGET_DIRS); do \
diff --git a/tools/libxen/Makefile b/tools/libxen/Makefile
index e2eeda74d86d6ba0c449d9e014297afced1cec04..58db515a72354c6afd9a173843cf6df669db51ec 100644 (file)
--- a/tools/libxen/Makefile
+++ b/tools/libxen/Makefile
@@ -57,8 +57,8 @@ test/test_hvm_bindings: test/test_hvm_bindings.o libxenapi.so
 
 .PHONY: install
 install: all
-       $(INSTALL_DIR) -p $(DESTDIR)/usr/include/xen/api
-       $(INSTALL_DIR) -p $(DESTDIR)/usr/$(LIBDIR)
+       $(INSTALL_DIR) $(DESTDIR)/usr/include/xen/api
+       $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
        $(INSTALL_PROG) libxenapi.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
        ln -sf libxenapi.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxenapi.so.$(MAJOR)
        ln -sf libxenapi.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenapi.so
diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile
index f96dd03aa34488925b722fc294609b71c27bfdcd..3629d897423035494112217490e151f69a2766da 100644 (file)
--- a/tools/pygrub/Makefile
+++ b/tools/pygrub/Makefile
@@ -13,11 +13,11 @@ ifndef XEN_PYTHON_NATIVE_INSTALL
 install: LIBPATH=$(shell PYTHONPATH=../python/xen/util python -c "import auxbin; print auxbin.libpath()")
 install: all
        CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --home="$(DESTDIR)/usr" --prefix="" --install-lib="$(DESTDIR)$(LIBPATH)/python"
-       $(INSTALL_DIR) -p $(DESTDIR)/var/run/xend/boot
+       $(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
 else
 install: all
        CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --root="$(DESTDIR)"
-       $(INSTALL_DIR) -p $(DESTDIR)/var/run/xend/boot
+       $(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
 endif
 
 .PHONY: clean
diff --git a/tools/security/Makefile b/tools/security/Makefile
index 289ddd2bf17670a5b7856870f5ce245104820c34..d4cc1b9b95f02532002fb0a362588ba1d7b2d7ef 100644 (file)
--- a/tools/security/Makefile
+++ b/tools/security/Makefile
@@ -58,23 +58,23 @@ ifndef XEN_PYTHON_NATIVE_INSTALL
 install: LIBPATH=$(shell PYTHONPATH=../python/xen/util python -c "import auxbin; print auxbin.libpath()")
 endif
 install: all $(ACM_CONFIG_FILE)
-       $(INSTALL_DIR) -p $(DESTDIR)/usr/sbin
-       $(INSTALL_PROG) -p $(ACM_INST_TOOLS) $(DESTDIR)/usr/sbin
-       $(INSTALL_PROG) -p $(ACM_EZPOLICY) $(DESTDIR)/usr/sbin
-       $(INSTALL_DIR) -p $(DESTDIR)$(ACM_CONFIG_DIR)
-       $(INSTALL_DIR) -p $(DESTDIR)$(ACM_POLICY_DIR)
-       $(INSTALL_DATA) -p policies/$(ACM_SCHEMA) $(DESTDIR)$(ACM_POLICY_DIR)
-       $(INSTALL_DIR) -p $(DESTDIR)$(ACM_POLICY_DIR)/example
+       $(INSTALL_DIR) $(DESTDIR)/usr/sbin
+       $(INSTALL_PROG) $(ACM_INST_TOOLS) $(DESTDIR)/usr/sbin
+       $(INSTALL_PROG) $(ACM_EZPOLICY) $(DESTDIR)/usr/sbin
+       $(INSTALL_DIR) $(DESTDIR)$(ACM_CONFIG_DIR)
+       $(INSTALL_DIR) $(DESTDIR)$(ACM_POLICY_DIR)
+       $(INSTALL_DATA) policies/$(ACM_SCHEMA) $(DESTDIR)$(ACM_POLICY_DIR)
+       $(INSTALL_DIR) $(DESTDIR)$(ACM_POLICY_DIR)/example
        for i in $(ACM_EXAMPLES); do \
-               $(INSTALL_DIR) -p $(DESTDIR)$(ACM_POLICY_DIR)/example/$$i; \
-               $(INSTALL_DATA) -p policies/example/$$i/client_v1-$(ACM_POLICY_SUFFIX) $(DESTDIR)$(ACM_POLICY_DIR)/example/$$i; \
+               $(INSTALL_DIR) $(DESTDIR)$(ACM_POLICY_DIR)/example/$$i; \
+               $(INSTALL_DATA) policies/example/$$i/client_v1-$(ACM_POLICY_SUFFIX) $(DESTDIR)$(ACM_POLICY_DIR)/example/$$i; \
        done
-       $(INSTALL_DIR) -p $(DESTDIR)$(ACM_SCRIPT_DIR)
-       $(INSTALL_PROG) -p $(ACM_SCRIPTS) $(DESTDIR)$(ACM_SCRIPT_DIR)
-       $(INSTALL_DIR) -p $(DESTDIR)$(ACM_SECGEN_HTMLDIR)
-       $(INSTALL_DATA) -p $(ACM_INST_HTML) $(DESTDIR)$(ACM_SECGEN_HTMLDIR)
-       $(INSTALL_DIR) -p $(DESTDIR)$(ACM_SECGEN_CGIDIR)
-       $(INSTALL_PROG) -p $(ACM_INST_CGI) $(DESTDIR)$(ACM_SECGEN_CGIDIR)
+       $(INSTALL_DIR) $(DESTDIR)$(ACM_SCRIPT_DIR)
+       $(INSTALL_PROG) $(ACM_SCRIPTS) $(DESTDIR)$(ACM_SCRIPT_DIR)
+       $(INSTALL_DIR) $(DESTDIR)$(ACM_SECGEN_HTMLDIR)
+       $(INSTALL_DATA) $(ACM_INST_HTML) $(DESTDIR)$(ACM_SECGEN_HTMLDIR)
+       $(INSTALL_DIR) $(DESTDIR)$(ACM_SECGEN_CGIDIR)
+       $(INSTALL_PROG) $(ACM_INST_CGI) $(DESTDIR)$(ACM_SECGEN_CGIDIR)
 ifndef XEN_PYTHON_NATIVE_INSTALL
        python python/setup.py install --home="$(DESTDIR)/usr" --install-lib="$(DESTDIR)$(LIBPATH)/python"
 else
diff --git a/tools/vnet/libxutil/Makefile b/tools/vnet/libxutil/Makefile
index 80cbe4443e333dc7f78f360ed1af52a9b39b22d2..0e790c58319f3af1a7e2f047f6eb0d3a459d457f 100644 (file)
--- a/tools/vnet/libxutil/Makefile
+++ b/tools/vnet/libxutil/Makefile
@@ -71,7 +71,7 @@ check-for-zlib:
 
 .PHONY: install
 install: build
-       [ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) -p $(DESTDIR)/usr/$(LIBDIR)
+       [ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
        $(INSTALL_PROG) libxutil.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
        $(INSTALL_DATA) libxutil.a $(DESTDIR)/usr/$(LIBDIR)
        ln -sf libxutil.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxutil.so.$(MAJOR)
diff --git a/tools/xenfb/Makefile b/tools/xenfb/Makefile
index b9bd3ba1e67e0b722bcf1a3cf7216ff3e9d8d4fc..98c64dea328f0395cf8550b039c9f2f1582a9554 100644 (file)
--- a/tools/xenfb/Makefile
+++ b/tools/xenfb/Makefile
@@ -1,13 +1,10 @@
 XEN_ROOT=../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-CFLAGS += -I$(XEN_LIBXC) -I$(XEN_XENSTORE) -I$(XEN_ROOT)/linux-2.6-xen-sparse/include -I$(XEN_ROOT)/tools/ioemu
+CFLAGS  += -I$(XEN_LIBXC) -I$(XEN_XENSTORE)
+CFLAGS  += -I$(XEN_ROOT)/linux-2.6-xen-sparse/include -I$(XEN_ROOT)/tools/ioemu
 LDFLAGS += -L$(XEN_LIBXC) -L$(XEN_XENSTORE)
 
-INSTALL         = install
-INSTALL_PROG    = $(INSTALL) -m0755
-INSTALL_DIR     = $(INSTALL) -d -m0755
-
 .PHONY: all
 all: build
 
@@ -16,7 +13,7 @@ build:
        $(MAKE) vncfb sdlfb
 
 install: all
-       $(INSTALL_DIR) -p $(DESTDIR)/usr/$(LIBDIR)/xen/bin
+       $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)/xen/bin
        $(INSTALL_PROG) vncfb $(DESTDIR)/usr/$(LIBDIR)/xen/bin/xen-vncfb
        $(INSTALL_PROG) sdlfb $(DESTDIR)/usr/$(LIBDIR)/xen/bin/xen-sdlfb
 
diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
index 0596379aca97ceac5579b0c634f2d6c01c8a2e6e..92268ca87544310e7efd9ca0fbc631880514092e 100644 (file)
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
@@ -168,16 +168,16 @@ tarball: clean
 
 .PHONY: install
 install: all
-       $(INSTALL_DIR) -p $(DESTDIR)/var/run/xenstored
-       $(INSTALL_DIR) -p $(DESTDIR)/var/lib/xenstored
-       $(INSTALL_DIR) -p $(DESTDIR)/usr/bin
-       $(INSTALL_DIR) -p $(DESTDIR)/usr/sbin
-       $(INSTALL_DIR) -p $(DESTDIR)/usr/include
+       $(INSTALL_DIR) $(DESTDIR)/var/run/xenstored
+       $(INSTALL_DIR) $(DESTDIR)/var/lib/xenstored
+       $(INSTALL_DIR) $(DESTDIR)/usr/bin
+       $(INSTALL_DIR) $(DESTDIR)/usr/sbin
+       $(INSTALL_DIR) $(DESTDIR)/usr/include
        $(INSTALL_PROG) xenstored $(DESTDIR)/usr/sbin
        $(INSTALL_PROG) $(CLIENTS) $(DESTDIR)/usr/bin
        $(INSTALL_PROG) xenstore-control $(DESTDIR)/usr/bin
        $(INSTALL_PROG) xenstore-ls $(DESTDIR)/usr/bin
-       $(INSTALL_DIR) -p $(DESTDIR)/usr/$(LIBDIR)
+       $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
        $(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
        ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxenstore.so.$(MAJOR)
        ln -sf libxenstore.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenstore.so
Unnamed repository; edit this file 'description' to name the repository.